bitkeeper revision 1.1026.2.3 (40e1802fsHtCzo5wPwaBhLn3j8lCJA)

Fixes to imports required to run "xm something" commands.

diff --git a/tools/xen/lib/xm/create.py b/tools/xen/lib/xm/create.py
index 1def1903f2dcae421eec243fd4d81c1da18628b4..12e2e8010c8488ca02cd2560ea98bbfbcc89ec4b 100644 (file)
--- a/tools/xen/lib/xm/create.py
+++ b/tools/xen/lib/xm/create.py
@@ -8,7 +8,7 @@ from xen.xend import sxp
 from xen.xend import PrettyPrint
 from xen.xend.XendClient import server
 
-from xen.xend.xm.opts import *
+from xen.xm.opts import *
 
 gopts = Opts(use="""[options]
 

diff --git a/tools/xen/lib/xm/main.py b/tools/xen/lib/xm/main.py
index 84abc7a867554e0c0eec888829952509ffe9c882..3ab5d23cf756f6ea326a1f775c4105b307898d75 100644 (file)
--- a/tools/xen/lib/xm/main.py
+++ b/tools/xen/lib/xm/main.py
@@ -9,7 +9,7 @@ from getopt import getopt
 from xen.xend import PrettyPrint
 from xen.xend import sxp
 from xen.xend.XendClient import server
-from xen.xend.xm import create, shutdown
+from xen.xm import create, shutdown
 
 class Prog:
     """Base class for sub-programs.

diff --git a/tools/xen/lib/xm/shutdown.py b/tools/xen/lib/xm/shutdown.py
index 7dc81008f1278973eeb61b9bbbff6f8220b96824..aaa354554aba283c9e6274b2214d9cc81c3b4528 100644 (file)
--- a/tools/xen/lib/xm/shutdown.py
+++ b/tools/xen/lib/xm/shutdown.py
@@ -6,7 +6,7 @@ import sys
 import time
 
 from xen.xend.XendClient import server
-from xen.xend.xm.opts import *
+from xen.xm.opts import *
 
 gopts = Opts(use="""[options] [DOM]